Merge version 7:8.0.1-3+rpi1 and 7:8.1-3 to produce 7:8.1-3+rpi1

diff --cc debian/changelog
index ddba0e2a568398c331c0cd2652dc529028355d8f,839575daf6c4993576d3a4070468299a7e9f2c17..e279cac23070ede2db9f4c4160b707343ffe260f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,32 +1,39 @@@
- ffmpeg (7:8.0.1-3+rpi1) forky-staging; urgency=medium
++ffmpeg (7:8.1-3+rpi1) forky-staging; urgency=medium
 +
++  [changes brought forward from 7:8.0.1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 21 Jan 2026 20:16:20 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 21 Jan 2026 20:16:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 31 Mar 2026 20:27:21 +0000
++
+ ffmpeg (7:8.1-3) unstable; urgency=medium
+ 
+   * debian/rules: Fix typo and really ignroe test on s390x
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 20 Mar 2026 21:39:51 +0100
+ 
+ ffmpeg (7:8.1-2) unstable; urgency=medium
+ 
+   * debian/tests: Drop one test for wtv
+   * debian/rules: Ignore failing tests on s390x
+   * debian/*.symbols: Add new symbols
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 20 Mar 2026 20:26:38 +0100
+ 
+ ffmpeg (7:8.1-1) unstable; urgency=medium
+ 
+   [ Sean McGovern ]
+   * d/rules: fix pkg.ffmpeg.stage1 build profile (no libxjl)
+ 
+   [ Sebastian Ramacher ]
+   * New upstream version 8.1
+     - Fix out-of-bounds in RV60 decoder (CVE-2025-69693)
+     - Enable whip muxer (Closes: #1125218)
+   * debian/control:
+     - Drop Priority: optional
+     - Add frei0r-plugins for tests and suggest it (LP: #1918584)
+     - Fix descriptions for -extra variants
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 20 Mar 2026 12:04:19 +0100
  
  ffmpeg (7:8.0.1-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge